Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Coffee machine take two #7497

Closed
wants to merge 524 commits into from
Closed

Coffee machine take two #7497

wants to merge 524 commits into from

Conversation

cuberound
Copy link
Contributor

@cuberound cuberound commented Nov 4, 2024 •
edited by github-actions bot
Loading

About the pull request

uses the icond and hopefuly sound ( no headphones can not test at the moment)

Explain why it's good for the game

Testing Photographs and Procedure

Screenshots & Videos

Put screenshots and videos here with an empty line between the screenshots and the <details> tags.

Changelog

🆑
add: better coffee machines
/:cl:

Zenith00000 and others added 30 commits June 2, 2024 13:52
@Zenith00000
vents done & survivors sprites
359915a
@Zenith00000
sprite changes, map & area fixes
d53c8ec
@Zenith00000
small fixes
a2680ba
@Drulikar
Update layer definition autodoc
d164a44
@Zenith00000
survivor clothing & presets - WIP
3c633c9
@Zenith00000
Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into …
35b54e6 
…Hybrisa
@Zenith00000
small loadout changes
77809a9
@Zenith00000
survivor fixes
5a0feb1
@Zenith00000
more survivor stuff, sprites, ect. Minor map fixes.
c05afe7
@Zenith00000
survivor changes
472a43e
@Zenith00000
sprite changes, survivor changes
b438ab5
@Zenith00000
new smg, sprite fixes, map fixes, corpses and survivor changes, vario…
15963cf 
…us small fixes.
@Zenith00000
smg fixes
1427c6d
@Zenith00000
Merge branch 'cmss13-devs:master' into Hybrisa
91add60
@Zenith00000
small map fixes and smg fixes.
30cd765
@Zenith00000
big survivor update, all finished. small map fixes, mostly survivor r…
d2365fa 
…elated.
@Zenith00000
sprite fixes, map fixes, Drivable Box-Vans!
5125f28
@Zenith00000
layering and offsetting fixes for wall objects + other misc minor fixes
5010760
@Zenith00000
car pileup fix + minor map fixes
275b157
@Drulikar
Manual partial patch of Van fixes & icon merge 6b49877
13f1606
@Zenith00000 @Drulikar
van fixes + minor map fixes
9422f66
@Drulikar
Merge remote-tracking branch 'upstream/master' into Hybrisa
09f18d0
@Zenith00000
sprite refinements, new bilboards, wy_sentry holders & van sounds, +m…
549bd1f 
…inor map changes & fixes
@Zenith00000
minor fixes, minor map and sprite fixes.
8d84c56
@Zenith00000
xeno spawns finally added ... oops.
5a9c581
@Zenith00000
minor map fixes
fdbb39d
@Zenith00000
very small fix to map
bad19d4
@Zenith00000
minor map fixes & deco_edging replacement sprites + desc for vehicles
009caea
@Zenith00000
minor map fix
f2a8b7a
@Zenith00000
layering fixes
6169779
Zenith00000 and others added 24 commits October 23, 2024 01:06
@Zenith00000
Merge remote-tracking branch 'upstream/master' into Hybrisa
c5e5d64
@Zenith00000
Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into …
5740c4a 
…Hybrisa
@Zenith00000
Merge branch 'master' into Hybrisa
e1f729d
@Zenith00000
podlock door fixes and widening of unbreakable podlock doors.
46617d5
@Zenith00000
Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into …
ede2248 
…Hybrisa
@Zenith00000
sprite changes, colony podlocks fixed + new sprites, small map changes.
4f6e2bb
@Zenith00000
indentation fix
c54adf9
@Zenith00000
fix
d1ee783
@Zenith00000
fix?
dcd9805
@Zenith00000
Merge branch 'master' into Hybrisa
c510191
@Zenith00000
Merge remote-tracking branch 'upstream/master' into Hybrisa
b0b4a2a
@Zenith00000
Merge branch 'cmss13-devs:master' into Hybrisa
8281f29
@Zenith00000
Map changes: adds 'scrapeaway' collapsible tunnels, which disappear a…
553890d 
…fter 40 minutes.
@Zenith00000
moves around some civ skill roles to avoid conflicts.
2c9cd55
@Zenith00000
area fixes and weedkiller implementation + minor map fixes.
b978509
@Zenith00000
map fixes, area fixes small icon fix.
fbfd818
@uuuuhuuuu
COFFEE
e755b1b
@uuuuhuuuu
maped in
7d4ae78
@Zenith00000
Merge pull request cmss13-devs#49 from cuberound/coffe-makers
89b2e0f 
Coffee makers
@Zenith00000
minor map changes - more xeno structures in caves, balance loot
92bd7d6
@Zenith00000
Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into …
cefe548 
…Hybrisa
@Zenith00000
minor code fix
5b5f09f
@Zenith00000
new coffee sprites, eastern caves blockage changed.
e821c08
@uuuuhuuuu
COFEEEEE
92d79f7
@cmss13-ci cmss13-ci bot added Sprites Remove the soul from the game. Mapping did you remember to save in tgm format? Sound Blast 5 minutes of bass boosted music to our players Feature Feature coder badge labels Nov 4, 2024
@cuberound cuberound closed this Nov 4, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Nanu308 Nanu308 Awaiting requested review from Nanu308 Nanu308 is a code owner

Assignees
No one assigned
Labels
Feature Feature coder badge Mapping did you remember to save in tgm format? Sound Blast 5 minutes of bass boosted music to our players Sprites Remove the soul from the game.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@cuberound @Zenith00000 @Drulikar @Nanu308 @uuuuhuuuu @harryob @Zonespace27 @Blundir @realforest2001